From b00f39b27b36b2e43038dc54abe2576f7eccce9b Mon Sep 17 00:00:00 2001 From: Wei Liu Date: Fri, 6 Mar 2015 11:33:48 +0000 Subject: [PATCH] libxc: use xc_dom_panic when decompressor is not supported State explicitly that specific decompressor is not supported by libxc. Without this change, libxc error message only says the provided kernel is invalid, which is misleading. Signed-off-by: Wei Liu Cc: Ian Campbell Cc: Ian Jackson Cc: svenvan.van@gmail.com Reviewed-by: Andrew Cooper Acked-by: Ian Campbell --- tools/libxc/xc_dom_bzimageloader.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/tools/libxc/xc_dom_bzimageloader.c b/tools/libxc/xc_dom_bzimageloader.c index 964ebdc64a..3bb17dd32d 100644 --- a/tools/libxc/xc_dom_bzimageloader.c +++ b/tools/libxc/xc_dom_bzimageloader.c @@ -185,8 +185,9 @@ static int xc_try_bzip2_decode( static int xc_try_bzip2_decode( struct xc_dom_image *dom, void **blob, size_t *size) { - DOMPRINTF("%s: BZIP2 decompress support unavailable", - __FUNCTION__); + xc_dom_panic(dom->xch, XC_INTERNAL_ERROR, + "%s: BZIP2 decompress support unavailable", + __FUNCTION__); return -1; } @@ -367,16 +368,18 @@ static int xc_try_lzma_decode( static int xc_try_xz_decode( struct xc_dom_image *dom, void **blob, size_t *size) { - DOMPRINTF("%s: XZ decompress support unavailable", - __FUNCTION__); + xc_dom_panic(dom->xch, XC_INTERNAL_ERROR, + "%s: XZ decompress support unavailable", + __FUNCTION__); return -1; } static int xc_try_lzma_decode( struct xc_dom_image *dom, void **blob, size_t *size) { - DOMPRINTF("%s: LZMA decompress support unavailable", - __FUNCTION__); + xc_dom_panic(dom->xch, XC_INTERNAL_ERROR, + "%s: LZMA decompress support unavailable", + __FUNCTION__); return -1; } @@ -577,8 +580,9 @@ static int xc_try_lzo1x_decode( static int xc_try_lzo1x_decode( struct xc_dom_image *dom, void **blob, size_t *size) { - DOMPRINTF("%s: LZO1x decompress support unavailable\n", - __FUNCTION__); + xc_dom_panic(dom->xch, XC_INTERNAL_ERROR, + "%s: LZO1x decompress support unavailable\n", + __FUNCTION__); return -1; } -- 2.30.2